Revision: bazaar--devel--1.3--patch-2
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Fri Mar  4 16:43:50 EST 2005
Standard-date: 2005-03-04 05:43:50 GMT
Modified-files: commands/delta.c commands/diff.c
    libarch/changeset-report.c libarch/changeset-report.h
    libarch/diffs.c libarch/diffs.h libarch/make-changeset.c
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--diffs--0--base-0
    aaron.bentley@utoronto.ca--baz/bazaar--diffs--0--patch-1
    aaron.bentley@utoronto.ca--baz/bazaar--diffs--0--patch-2
    aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--base-0
    aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-1
    aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-2
    aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-3
    aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-4
    aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-5
    aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-6
    aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-7
    aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-8
    aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-9
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-2
    thelove@canonical.com/bazaar--devo--1.3--patch-1
    thelove@canonical.com/bazaar--devo--1.3--patch-2
Summary: merge from rf
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--baz/bazaar--diffs--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.3--patch-1

 * aaron.bentley@utoronto.ca--baz/bazaar--diffs--0--patch-1
   Merge (aaron.bentley@utoronto.ca--tla-2004)

 * aaron.bentley@utoronto.ca--baz/bazaar--diffs--0--patch-2
   Got delta using unidirectional customizable diffs

 * aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.2--patch-30

 * aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-1
   Refactored arch_print_changeset_diffs 

 * aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-2
   More refactoring cleanup

 * aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-3
   Got the data passed to the right places

 * aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-4
   Got the rediffing portion working

 * aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-5
   Got baz diff -p working

 * aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-6
   Fixed up added/removed file handling

 * aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-7
   Clean-up work

 * aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-8
   Added FIXME for lifeless

 * aaron.bentley@utoronto.ca--tla-2004/bazaar--diffs--0--patch-9
   Made print_diffs_new handle removed file diffs, optimized

 * thelove@canonical.com/bazaar--devo--1.3--patch-1
   use str_replace in a few obvious place

 * thelove@canonical.com/bazaar--devo--1.3--patch-2
   added -p to diff and delta, made diffs unidirectional

